diff --git a/consensus/wal_test.go b/consensus/wal_test.go
index 58b5b8c2..4a866aa8 100644
--- a/consensus/wal_test.go
+++ b/consensus/wal_test.go
@@ -48,8 +48,8 @@ func TestSearchForEndHeight(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	h := 3
-	gr, found, err := wal.SearchForEndHeight(uint64(h))
+	h := uint64(3)
+	gr, found, err := wal.SearchForEndHeight(h)
 	assert.NoError(t, err, cmn.Fmt("expected not to err on height %d", h))
 	assert.True(t, found, cmn.Fmt("expected to find end height for %d", h))
 	assert.NotNil(t, gr, "expected group not to be nil")
@@ -61,7 +61,6 @@ func TestSearchForEndHeight(t *testing.T) {
 	rs, ok := msg.Msg.(tmtypes.EventDataRoundState)
 	assert.True(t, ok, "expected message of type EventDataRoundState")
 	assert.Equal(t, rs.Height, h+1, cmn.Fmt("wrong height"))
-
 }
 
 var initOnce sync.Once
diff --git a/mempool/mempool.go b/mempool/mempool.go
index 3bf946be..40cea4f1 100644
--- a/mempool/mempool.go
+++ b/mempool/mempool.go
@@ -66,7 +66,7 @@ type Mempool struct {
 	recheckCursor        *clist.CElement // next expected response
 	recheckEnd           *clist.CElement // re-checking stops here
 	notifiedTxsAvailable bool            // true if fired on txsAvailable for this height
-	txsAvailable         chan uint64        // fires the next height once for each height, when the mempool is not empty
+	txsAvailable         chan uint64     // fires the next height once for each height, when the mempool is not empty
 
 	// Keep a cache of already-seen txs.
 	// This reduces the pressure on the proxyApp.
@@ -433,7 +433,7 @@ type mempoolTx struct {
 
 // Height returns the height for this transaction
 func (memTx *mempoolTx) Height() uint64 {
-	return uint64(atomic.LoadUint64(&memTx.height))
+	return atomic.LoadUint64(&memTx.height)
 }
 
 //--------------------------------------------------------------------------------
diff --git a/types/protobuf.go b/types/protobuf.go
index c8c9f843..f7c8b512 100644
--- a/types/protobuf.go
+++ b/types/protobuf.go
@@ -13,7 +13,7 @@ type tm2pb struct{}
 func (tm2pb) Header(header *Header) *types.Header {
 	return &types.Header{
 		ChainId:        header.ChainID,
-		Height:         uint64(header.Height),
+		Height:         header.Height,
 		Time:           uint64(header.Time.Unix()),
 		NumTxs:         uint64(header.NumTxs),
 		LastBlockId:    TM2PB.BlockID(header.LastBlockID),