diff --git a/server/start.go b/server/start.go
index a1e630d818..faa49cc672 100644
--- a/server/start.go
+++ b/server/start.go
@@ -99,8 +99,6 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
 
 	// run forever (the node will not be returned)
 	select {}
-
-	return nil
 }
 
 func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
diff --git a/types/errors/abci_test.go b/types/errors/abci_test.go
index b0981c2f74..a1210a6bdc 100644
--- a/types/errors/abci_test.go
+++ b/types/errors/abci_test.go
@@ -189,7 +189,7 @@ func TestRedact(t *testing.T) {
 
 func TestABCIInfoSerializeErr(t *testing.T) {
 	var (
-		// Create errors with stacktrace for equal comparision.
+		// Create errors with stacktrace for equal comparison.
 		myErrDecode = Wrap(ErrTxDecode, "test")
 		myErrAddr   = Wrap(ErrInvalidAddress, "tester")
 		myPanic     = ErrPanic
diff --git a/types/module/module.go b/types/module/module.go
index 1501d6a394..c410bcf105 100644
--- a/types/module/module.go
+++ b/types/module/module.go
@@ -338,4 +338,4 @@ func (m *Manager) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) abci.Respo
 		ValidatorUpdates: validatorUpdates,
 		Events:           ctx.EventManager().ABCIEvents(),
 	}
-}
\ No newline at end of file
+}
diff --git a/x/gov/client/rest/query.go b/x/gov/client/rest/query.go
index f02942d5b6..b67f4c3590 100644
--- a/x/gov/client/rest/query.go
+++ b/x/gov/client/rest/query.go
@@ -14,7 +14,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
-
 func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router) {
 	r.HandleFunc(fmt.Sprintf("/gov/parameters/{%s}", RestParamsType), queryParamsHandlerFn(cliCtx)).Methods("GET")
 	r.HandleFunc("/gov/proposals", queryProposalsWithParameterFn(cliCtx)).Methods("GET")
@@ -27,7 +26,6 @@ func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router) {
 	r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/votes/{%s}", RestProposalID, RestVoter), queryVoteHandlerFn(cliCtx)).Methods("GET")
 }
 
-
 func queryParamsHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		vars := mux.Vars(r)
diff --git a/x/gov/types/genesis_test.go b/x/gov/types/genesis_test.go
index 480c3cb5df..6fc2113833 100644
--- a/x/gov/types/genesis_test.go
+++ b/x/gov/types/genesis_test.go
@@ -19,4 +19,4 @@ func TestEqualProposalID(t *testing.T) {
 	state2.StartingProposalID = 1
 	require.Equal(t, state1, state2)
 	require.True(t, state1.Equal(state2))
-}
\ No newline at end of file
+}
diff --git a/x/gov/types/tally.go b/x/gov/types/tally.go
index 63f20d4b7f..d437816e9a 100644
--- a/x/gov/types/tally.go
+++ b/x/gov/types/tally.go
@@ -68,6 +68,7 @@ func (tr TallyResult) Equals(comp TallyResult) bool {
 		tr.No.Equal(comp.No) &&
 		tr.NoWithVeto.Equal(comp.NoWithVeto)
 }
+
 // String implements stringer interface
 func (tr TallyResult) String() string {
 	return fmt.Sprintf(`Tally Result:
diff --git a/x/params/client/rest/rest.go b/x/params/client/rest/rest.go
index 355296fdb0..101dc49a4d 100644
--- a/x/params/client/rest/rest.go
+++ b/x/params/client/rest/rest.go
@@ -7,8 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramscutils "github.com/cosmos/cosmos-sdk/x/params/client/utils"
 )