diff --git a/cmd/cmd.go b/cmd/cmd.go
index 9a001a3e..586eafce 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -22,9 +22,9 @@ func ListPackagesRefList(reflist *debian.PackageRefList) (err error) {
 	packageCollection := debian.NewPackageCollection(context.database)
 
 	err = reflist.ForEach(func(key []byte) error {
-		p, err := packageCollection.ByKey(key)
-		if err != nil {
-			return err
+		p, err2 := packageCollection.ByKey(key)
+		if err2 != nil {
+			return err2
 		}
 		fmt.Printf("  %s\n", p)
 		return nil
diff --git a/cmd/db_cleanup.go b/cmd/db_cleanup.go
index d61f89fb..98c009f6 100644
--- a/cmd/db_cleanup.go
+++ b/cmd/db_cleanup.go
@@ -94,13 +94,13 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
 	context.progress.InitBar(int64(existingPackageRefs.Len()), false)
 
 	err = existingPackageRefs.ForEach(func(key []byte) error {
-		pkg, err := packageCollection.ByKey(key)
-		if err != nil {
-			return err
+		pkg, err2 := packageCollection.ByKey(key)
+		if err2 != nil {
+			return err2
 		}
-		paths, err := pkg.FilepathList(context.packagePool)
-		if err != nil {
-			return err
+		paths, err2 := pkg.FilepathList(context.packagePool)
+		if err2 != nil {
+			return err2
 		}
 		referencedFiles = append(referencedFiles, paths...)
 		context.progress.AddBar(1)
diff --git a/cmd/repo_add.go b/cmd/repo_add.go
index 405f147c..412a5dd1 100644
--- a/cmd/repo_add.go
+++ b/cmd/repo_add.go
@@ -45,15 +45,15 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 	packageFiles := []string{}
 
 	for _, location := range args[1:] {
-		info, err := os.Stat(location)
-		if err != nil {
-			context.progress.ColoredPrintf("@y[!]@| @!Unable to process %s: %s@|", location, err)
+		info, err2 := os.Stat(location)
+		if err2 != nil {
+			context.progress.ColoredPrintf("@y[!]@| @!Unable to process %s: %s@|", location, err2)
 			continue
 		}
 		if info.IsDir() {
-			err = filepath.Walk(location, func(path string, info os.FileInfo, err error) error {
-				if err != nil {
-					return err
+			err2 = filepath.Walk(location, func(path string, info os.FileInfo, err3 error) error {
+				if err3 != nil {
+					return err3
 				}
 				if info.IsDir() {
 					return nil
@@ -81,7 +81,6 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 	for _, file := range packageFiles {
 		var (
 			stanza debian.Stanza
-			err    error
 			p      *debian.Package
 		)
 
@@ -106,7 +105,8 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 			continue
 		}
 
-		checksums, err := utils.ChecksumsForFile(file)
+		var checksums utils.ChecksumInfo
+		checksums, err = utils.ChecksumsForFile(file)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/repo_move.go b/cmd/repo_move.go
index 698ae5a4..5c88636d 100644
--- a/cmd/repo_move.go
+++ b/cmd/repo_move.go
@@ -51,23 +51,24 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 
 		srcRefList = srcRepo.RefList()
 	} else if command == "import" {
+		var srcRemoteRepo *debian.RemoteRepo
 		repoCollection := debian.NewRemoteRepoCollection(context.database)
 
-		srcRepo, err := repoCollection.ByName(args[0])
+		srcRemoteRepo, err = repoCollection.ByName(args[0])
 		if err != nil {
 			return fmt.Errorf("unable to %s: %s", command, err)
 		}
 
-		err = repoCollection.LoadComplete(srcRepo)
+		err = repoCollection.LoadComplete(srcRemoteRepo)
 		if err != nil {
 			return fmt.Errorf("unable to %s: %s", command, err)
 		}
 
-		if srcRepo.RefList() == nil {
+		if srcRemoteRepo.RefList() == nil {
 			return fmt.Errorf("unable to %s: mirror not updated", command)
 		}
 
-		srcRefList = srcRepo.RefList()
+		srcRefList = srcRemoteRepo.RefList()
 	} else {
 		panic("unexpected command")
 	}
diff --git a/cmd/snapshot_create.go b/cmd/snapshot_create.go
index 7919e920..07a2f67c 100644
--- a/cmd/snapshot_create.go
+++ b/cmd/snapshot_create.go
@@ -15,10 +15,12 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
 
 	if len(args) == 4 && args[1] == "from" && args[2] == "mirror" {
 		// aptly snapshot create snap from mirror mirror
+		var repo *debian.RemoteRepo
+
 		repoName, snapshotName := args[3], args[0]
 
 		repoCollection := debian.NewRemoteRepoCollection(context.database)
-		repo, err := repoCollection.ByName(repoName)
+		repo, err = repoCollection.ByName(repoName)
 		if err != nil {
 			return fmt.Errorf("unable to create snapshot: %s", err)
 		}
@@ -34,10 +36,12 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
 		}
 	} else if len(args) == 4 && args[1] == "from" && args[2] == "repo" {
 		// aptly snapshot create snap from repo repo
+		var repo *debian.LocalRepo
+
 		localRepoName, snapshotName := args[3], args[0]
 
 		localRepoCollection := debian.NewLocalRepoCollection(context.database)
-		repo, err := localRepoCollection.ByName(localRepoName)
+		repo, err = localRepoCollection.ByName(localRepoName)
 		if err != nil {
 			return fmt.Errorf("unable to create snapshot: %s", err)
 		}
diff --git a/cmd/snapshot_pull.go b/cmd/snapshot_pull.go
index 791843b3..3c7e184f 100644
--- a/cmd/snapshot_pull.go
+++ b/cmd/snapshot_pull.go
@@ -127,7 +127,8 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 			pL := debian.NewPackageList()
 			pL.Add(pkg)
 
-			missing, err := pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList, nil)
+			var missing []debian.Dependency
+			missing, err = pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList, nil)
 			if err != nil {
 				context.progress.ColoredPrintf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
 			}
diff --git a/cmd/snapshot_verify.go b/cmd/snapshot_verify.go
index 44fe2d5d..c69720b7 100644
--- a/cmd/snapshot_verify.go
+++ b/cmd/snapshot_verify.go
@@ -44,8 +44,9 @@ func aptlySnapshotVerify(cmd *commander.Command, args []string) error {
 		fmt.Errorf("unable to merge sources: %s", err)
 	}
 
+	var pL *debian.PackageList
 	for i := 1; i < len(snapshots); i++ {
-		pL, err := debian.NewPackageListFromRefList(snapshots[i].RefList(), packageCollection, context.progress)
+		pL, err = debian.NewPackageListFromRefList(snapshots[i].RefList(), packageCollection, context.progress)
 		if err != nil {
 			fmt.Errorf("unable to load packages: %s", err)
 		}
diff --git a/debian/list.go b/debian/list.go
index 9d1549ec..b26df418 100644
--- a/debian/list.go
+++ b/debian/list.go
@@ -63,9 +63,9 @@ func NewPackageListFromRefList(reflist *PackageRefList, collection *PackageColle
 	}
 
 	err := reflist.ForEach(func(key []byte) error {
-		p, err := collection.ByKey(key)
-		if err != nil {
-			return fmt.Errorf("unable to load package with key %s: %s", key, err)
+		p, err2 := collection.ByKey(key)
+		if err2 != nil {
+			return fmt.Errorf("unable to load package with key %s: %s", key, err2)
 		}
 		if progress != nil {
 			progress.AddBar(1)
diff --git a/debian/publish.go b/debian/publish.go
index 51286e4d..25210459 100644
--- a/debian/publish.go
+++ b/debian/publish.go
@@ -10,6 +10,7 @@ import (
 	"github.com/smira/aptly/utils"
 	"github.com/ugorji/go/codec"
 	"log"
+	"os"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -273,7 +274,8 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 			return err
 		}
 
-		packagesFile, err := publishedStorage.CreateFile(filepath.Join(basePath, relativePath))
+		var packagesFile *os.File
+		packagesFile, err = publishedStorage.CreateFile(filepath.Join(basePath, relativePath))
 		if err != nil {
 			return fmt.Errorf("unable to creates Packages file: %s", err)
 		}
@@ -324,7 +326,8 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 
 		packagesFile.Close()
 
-		checksumInfo, err := publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath))
+		var checksumInfo utils.ChecksumInfo
+		checksumInfo, err = publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath))
 		if err != nil {
 			return fmt.Errorf("unable to collect checksums: %s", err)
 		}
diff --git a/debian/remote.go b/debian/remote.go
index c2c2745d..54d7bdc2 100644
--- a/debian/remote.go
+++ b/debian/remote.go
@@ -170,8 +170,8 @@ func (repo *RemoteRepo) PackageURL(filename string) *url.URL {
 // Fetch updates information about repository
 func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error {
 	var (
-		release *os.File
-		err     error
+		release, inrelease, releasesig *os.File
+		err                            error
 	)
 
 	if verifier == nil {
@@ -182,7 +182,7 @@ func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error
 		}
 	} else {
 		// 1. try InRelease file
-		inrelease, err := http.DownloadTemp(d, repo.ReleaseURL("InRelease").String())
+		inrelease, err = http.DownloadTemp(d, repo.ReleaseURL("InRelease").String())
 		if err != nil {
 			goto splitsignature
 		}
@@ -209,7 +209,7 @@ func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error
 			return err
 		}
 
-		releasesig, err := http.DownloadTemp(d, repo.ReleaseURL("Release.gpg").String())
+		releasesig, err = http.DownloadTemp(d, repo.ReleaseURL("Release.gpg").String())
 		if err != nil {
 			return err
 		}
@@ -275,7 +275,8 @@ ok:
 				return fmt.Errorf("unparseable hash sum line: %#v", line)
 			}
 
-			size, err := strconv.ParseInt(parts[1], 10, 64)
+			var size int64
+			size, err = strconv.ParseInt(parts[1], 10, 64)
 			if err != nil {
 				return fmt.Errorf("unable to parse size: %s", err)
 			}
@@ -395,9 +396,9 @@ func (repo *RemoteRepo) Download(progress aptly.Progress, d aptly.Downloader, pa
 	downloadSize := int64(0)
 
 	err := list.ForEach(func(p *Package) error {
-		list, err := p.DownloadList(packagePool)
-		if err != nil {
-			return err
+		list, err2 := p.DownloadList(packagePool)
+		if err2 != nil {
+			return err2
 		}
 		p.files = nil