diff --git a/bchain/coins/ecash/ecashparser.go b/bchain/coins/ecash/ecashparser.go
index e4547ae8..2b4ef881 100644
--- a/bchain/coins/ecash/ecashparser.go
+++ b/bchain/coins/ecash/ecashparser.go
@@ -3,11 +3,11 @@ package ecash
 import (
 	"fmt"
 
-	"github.com/pirk/ecashutil"
 	"github.com/martinboehm/btcutil"
 	"github.com/martinboehm/btcutil/chaincfg"
 	"github.com/martinboehm/btcutil/txscript"
 	"github.com/pirk/ecashaddr-converter/address"
+	"github.com/pirk/ecashutil"
 	"github.com/trezor/blockbook/bchain"
 	"github.com/trezor/blockbook/bchain/coins/btc"
 )
diff --git a/bchain/coins/firo/firoparser.go b/bchain/coins/firo/firoparser.go
index d2b9e1f0..cfdf9c4a 100644
--- a/bchain/coins/firo/firoparser.go
+++ b/bchain/coins/firo/firoparser.go
@@ -14,13 +14,13 @@ import (
 )
 
 const (
-	OpZeroCoinMint      = 0xc1
-	OpZeroCoinSpend     = 0xc2
-	OpSigmaMint         = 0xc3
-	OpSigmaSpend        = 0xc4
-	OpLelantusMint      = 0xc5
-	OpLelantusJMint     = 0xc6
-	OpLelantusJoinSplit = 0xc7
+	OpZeroCoinMint             = 0xc1
+	OpZeroCoinSpend            = 0xc2
+	OpSigmaMint                = 0xc3
+	OpSigmaSpend               = 0xc4
+	OpLelantusMint             = 0xc5
+	OpLelantusJMint            = 0xc6
+	OpLelantusJoinSplit        = 0xc7
 	OpLelantusJoinSplitPayload = 0xc9
 
 	MainnetMagic wire.BitcoinNet = 0xe3d9fef1
@@ -194,7 +194,6 @@ func (p *FiroParser) ParseBlock(b []byte) (*bchain.Block, error) {
 					break
 				}
 			}
-			
 
 			if !isAllZero {
 				// hash data
@@ -344,7 +343,7 @@ type MTPHashDataRoot struct {
 }
 
 type MTPHashData struct {
-	BlockMTP    [128][128]uint64
+	BlockMTP [128][128]uint64
 }
 
 type MTPBlockHeader struct {
diff --git a/build/tools/trezor-common/sync-coins.go b/build/tools/trezor-common/sync-coins.go
index f4e90ba1..acb5518e 100644
--- a/build/tools/trezor-common/sync-coins.go
+++ b/build/tools/trezor-common/sync-coins.go
@@ -1,4 +1,4 @@
-//usr/bin/go run $0 $@ ; exit
+// usr/bin/go run $0 $@ ; exit
 package main
 
 import (
diff --git a/common/jsonnumber.go b/common/jsonnumber.go
index d209fbe2..d6eab76c 100644
--- a/common/jsonnumber.go
+++ b/common/jsonnumber.go
@@ -6,7 +6,9 @@ import (
 )
 
 // JSONNumber is used instead of json.Number after upgrade to go 1.14
-//  to handle data which can be numbers in double quotes or possibly not numbers at all
+//
+//	to handle data which can be numbers in double quotes or possibly not numbers at all
+//
 // see https://github.com/golang/go/issues/37308
 type JSONNumber string