diff --git a/deb/index_files.go b/deb/index_files.go
index adc69715..9c79d6c2 100644
--- a/deb/index_files.go
+++ b/deb/index_files.go
@@ -203,7 +203,8 @@ func packageIndexByHash(file *indexFile, ext string, hash string, sum string) er
 	if file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile)) {
 		// if exists, remove old symlink
 		if file.parent.publishedStorage.FileExists(filepath.Join(dst, indexfile+".old")) {
-			link, err := file.parent.publishedStorage.ReadLink(filepath.Join(dst, indexfile+".old"))
+			var link string
+			link, err = file.parent.publishedStorage.ReadLink(filepath.Join(dst, indexfile+".old"))
 			if err != nil {
 				file.parent.publishedStorage.Remove(link)
 			}
diff --git a/s3/public.go b/s3/public.go
index 8a222c8b..8cdd4bd6 100644
--- a/s3/public.go
+++ b/s3/public.go
@@ -393,7 +393,7 @@ func (storage *PublishedStorage) SymLink(src string, dst string) error {
 		CopySource: aws.String(src),
 		Key:        aws.String(filepath.Join(storage.prefix, dst)),
 		ACL:        aws.String(storage.acl),
-		Metadata:   map[string]*string{
+		Metadata: map[string]*string{
 			"SymLink": aws.String(src),
 		},
 		MetadataDirective: aws.String("REPLACE"),
@@ -426,11 +426,7 @@ func (storage *PublishedStorage) FileExists(path string) bool {
 		Key:    aws.String(filepath.Join(storage.prefix, path)),
 	}
 	_, err := storage.s3.HeadObject(params)
-	if err != nil {
-		return false
-	}
-
-	return true
+	return err == nil
 }
 
 // ReadLink returns the symbolic link pointed to by path.
diff --git a/s3/public_test.go b/s3/public_test.go
index 7d9f790e..60cf2240 100644
--- a/s3/public_test.go
+++ b/s3/public_test.go
@@ -284,8 +284,7 @@ func (s *PublishedStorageSuite) TestLinkFromPool(c *C) {
 func (s *PublishedStorageSuite) TestSymLink(c *C) {
 	s.PutFile(c, "a/b", []byte("test"))
 
-	var err error
-	err = s.storage.SymLink("a/b", "a/b.link")
+	err := s.storage.SymLink("a/b", "a/b.link")
 	c.Check(err, IsNil)
 
 	var link string
@@ -296,7 +295,6 @@ func (s *PublishedStorageSuite) TestSymLink(c *C) {
 	c.Skip("copy not available in s3test")
 }
 
-
 func (s *PublishedStorageSuite) TestFileExists(c *C) {
 	s.PutFile(c, "a/b", []byte("test"))