diff --git a/deb/reflist.go b/deb/reflist.go
index 1c8a42551d..187475dd48 100644
--- a/deb/reflist.go
+++ b/deb/reflist.go
@@ -395,6 +395,4 @@ func (l *PackageRefList) FilterLatestRefs() {
 
 		lastArch, lastName, lastVer = arch, name, ver
 	}
-
-	return
 }
diff --git a/deb/remote.go b/deb/remote.go
index dcc419d96c..b0f25fc184 100644
--- a/deb/remote.go
+++ b/deb/remote.go
@@ -198,7 +198,7 @@ func (repo *RemoteRepo) IndexesRootURL() *url.URL {
 	if !repo.IsFlat() {
 		path = &url.URL{Path: fmt.Sprintf("dists/%s/", repo.Distribution)}
 	} else {
-		path = &url.URL{Path: fmt.Sprintf("%s", repo.Distribution)}
+		path = &url.URL{Path: repo.Distribution}
 	}
 
 	return repo.archiveRootURL.ResolveReference(path)
diff --git a/query/lex_test.go b/query/lex_test.go
index 27d8b04b1e..607712c3f4 100644
--- a/query/lex_test.go
+++ b/query/lex_test.go
@@ -1,10 +1,6 @@
 package query
 
-import (
-	"fmt"
-
-	. "gopkg.in/check.v1"
-)
+import . "gopkg.in/check.v1"
 
 type LexerSuite struct {
 }
@@ -46,13 +42,13 @@ func (s *LexerSuite) TestConsume(c *C) {
 func (s *LexerSuite) TestString(c *C) {
 	l, _ := lex("query", "package (<< 1.3)")
 
-	c.Check(fmt.Sprintf("%s", l.Current()), Equals, "\"package\"")
+	c.Check(l.Current().String(), Equals, "\"package\"")
 	l.Consume()
-	c.Check(fmt.Sprintf("%s", l.Current()), Equals, "(")
+	c.Check(l.Current().String(), Equals, "(")
 }
 
 func (s *LexerSuite) TestError(c *C) {
 	l, _ := lex("query", "'package")
 
-	c.Check(fmt.Sprintf("%s", l.Current()), Equals, "error: unexpected eof in quoted string")
+	c.Check(l.Current().String(), Equals, "error: unexpected eof in quoted string")
 }