diff --git a/core/chain.go b/core/chain.go
index f8869507..741b6f2a 100644
--- a/core/chain.go
+++ b/core/chain.go
@@ -20,7 +20,7 @@ import (
 // NOTE: Ethermint will distribute the fees out to validators, so the structure
 // and functionality of this is a WIP and subject to change.
 type ChainContext struct {
-	Coinbase ethcommon.Address
+	Coinbase        ethcommon.Address
 	headersByNumber map[uint64]*ethtypes.Header
 }
 
diff --git a/main.go b/main.go
index c4ae31de..d61b2f52 100644
--- a/main.go
+++ b/main.go
@@ -11,6 +11,8 @@ import (
 	"io"
 	"os"
 
+	"github.com/cosmos/ethermint/core"
+	"github.com/cosmos/ethermint/state"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	ethmisc "github.com/ethereum/go-ethereum/consensus/misc"
 	ethcore "github.com/ethereum/go-ethereum/core"
@@ -19,8 +21,6 @@ import (
 	ethvm "github.com/ethereum/go-ethereum/core/vm"
 	ethparams "github.com/ethereum/go-ethereum/params"
 	ethrlp "github.com/ethereum/go-ethereum/rlp"
-	"github.com/ledgerwatch/ethermint/core"
-	"github.com/ledgerwatch/ethermint/state"
 	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
@@ -195,7 +195,7 @@ func main() {
 		}
 
 		n++
-		if (n%100) == 0 {
+		if (n % 100) == 0 {
 			fmt.Printf("processed %d blocks\n", n)
 		}
 		if n >= 1000 {
diff --git a/state/database.go b/state/database.go
index f309ed5b..b097621e 100644
--- a/state/database.go
+++ b/state/database.go
@@ -3,10 +3,10 @@ package state
 import (
 	"github.com/cosmos/cosmos-sdk/store"
 	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/ethermint/core"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	ethstate "github.com/ethereum/go-ethereum/core/state"
 	ethtrie "github.com/ethereum/go-ethereum/trie"
-	"github.com/ledgerwatch/ethermint/core"
 	dbm "github.com/tendermint/tendermint/libs/db"
 )