diff --git a/cmd/gitql/query.go b/cmd/gitql/query.go
index 5883bc150..19914a1e2 100644
--- a/cmd/gitql/query.go
+++ b/cmd/gitql/query.go
@@ -36,22 +36,15 @@ func (c *CmdQuery) Execute(args []string) error {
 		return err
 	}
 
-	if err := c.executeQuery(); err != nil {
-		return err
-	}
-
-	return nil
+	return c.executeQuery()
 }
 
 func (c *CmdQuery) validate() error {
 	var err error
 	c.Path, err = findDotGitFolder(c.Path)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
+
 func (c *CmdQuery) buildDatabase() error {
 	c.print("opening %q repository...\n", c.Path)
 
diff --git a/git/commits.go b/git/commits.go
index 48d50ded1..241427857 100644
--- a/git/commits.go
+++ b/git/commits.go
@@ -1,8 +1,6 @@
 package git
 
 import (
-	"io"
-
 	"github.com/gitql/gitql/sql"
 
 	"gopkg.in/src-d/go-git.v4"
@@ -64,9 +62,6 @@ type commitIter struct {
 
 func (i *commitIter) Next() (sql.Row, error) {
 	commit, err := i.i.Next()
-	if err == io.EOF {
-		return nil, io.EOF
-	}
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/analyzer/analyzer.go b/sql/analyzer/analyzer.go
index 19970c4d1..ece90f8bc 100644
--- a/sql/analyzer/analyzer.go
+++ b/sql/analyzer/analyzer.go
@@ -35,18 +35,13 @@ func (a *Analyzer) Analyze(n sql.Node) (sql.Node, error) {
 	for !reflect.DeepEqual(prev, cur) {
 		prev = cur
 		cur = a.analyzeOnce(n)
-		i += 1
+		i++
 		if i >= maxAnalysisIterations {
 			return cur, fmt.Errorf("exceeded max analysis iterations (%d)", maxAnalysisIterations)
 		}
 	}
 
-	err := a.validate(cur)
-	if err != nil {
-		return cur, err
-	}
-
-	return cur, nil
+	return cur, a.validate(cur)
 }
 
 func (a *Analyzer) analyzeOnce(n sql.Node) sql.Node {
diff --git a/sql/expression/comparison_test.go b/sql/expression/comparison_test.go
index aacab2306..30910db1c 100644
--- a/sql/expression/comparison_test.go
+++ b/sql/expression/comparison_test.go
@@ -15,32 +15,32 @@ const (
 )
 
 var comparisonCases = map[sql.Type]map[int][][]interface{}{
-	sql.String: map[int][][]interface{}{
-		testEqual: [][]interface{}{
-			[]interface{}{"foo", "foo"},
-			[]interface{}{"", ""},
+	sql.String: {
+		testEqual: {
+			{"foo", "foo"},
+			{"", ""},
 		},
-		testLess: [][]interface{}{
-			[]interface{}{"a", "b"},
-			[]interface{}{"", "1"},
+		testLess: {
+			{"a", "b"},
+			{"", "1"},
 		},
-		testGreater: [][]interface{}{
-			[]interface{}{"b", "a"},
-			[]interface{}{"1", ""},
+		testGreater: {
+			{"b", "a"},
+			{"1", ""},
 		},
 	},
-	sql.Integer: map[int][][]interface{}{
-		testEqual: [][]interface{}{
-			[]interface{}{int32(1), int32(1)},
-			[]interface{}{int32(0), int32(0)},
+	sql.Integer: {
+		testEqual: {
+			{int32(1), int32(1)},
+			{int32(0), int32(0)},
 		},
-		testLess: [][]interface{}{
-			[]interface{}{int32(-1), int32(0)},
-			[]interface{}{int32(1), int32(2)},
+		testLess: {
+			{int32(-1), int32(0)},
+			{int32(1), int32(2)},
 		},
-		testGreater: [][]interface{}{
-			[]interface{}{int32(2), int32(1)},
-			[]interface{}{int32(0), int32(-1)},
+		testGreater: {
+			{int32(2), int32(1)},
+			{int32(0), int32(-1)},
 		},
 	},
 }