diff --git a/cmd/snapshot_list.go b/cmd/snapshot_list.go
index 57f995e0..d28cea10 100644
--- a/cmd/snapshot_list.go
+++ b/cmd/snapshot_list.go
@@ -18,8 +18,8 @@ type snapshotListToSort struct {
 	sortMethod int
 }
 
-func ParseSortMethod(sortMethod_string string) (int, error) {
-	switch sortMethod_string {
+func parseSortMethod(sortMethod string) (int, error) {
+	switch sortMethod {
 	case "time", "Time":
 		return SortTime, nil
 	case "name", "Name":
@@ -55,11 +55,11 @@ func aptlySnapshotList(cmd *commander.Command, args []string) error {
 	}
 
 	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
-	sortMethod_string := cmd.Flag.Lookup("sort").Value.Get().(string)
+	sortMethodString := cmd.Flag.Lookup("sort").Value.Get().(string)
 
 	snapshotsToSort := &snapshotListToSort{}
 	snapshotsToSort.list = make([]*deb.Snapshot, context.CollectionFactory().SnapshotCollection().Len())
-	snapshotsToSort.sortMethod, err = ParseSortMethod(sortMethod_string)
+	snapshotsToSort.sortMethod, err = ParseSortMethod(sortMethodString)
 	if err != nil {
 		return err
 	}
diff --git a/deb/list_test.go b/deb/list_test.go
index 04da48da..16443b58 100644
--- a/deb/list_test.go
+++ b/deb/list_test.go
@@ -18,8 +18,7 @@ func (c *containsChecker) Check(params []interface{}, names []string) (result bo
 		ok        bool
 	)
 
-	pkgMap := make (map[*Package]bool)
-
+	pkgMap := make(map[*Package]bool)
 
 	pkgSlice1, ok = params[0].([]*Package)
 	if !ok {
@@ -42,7 +41,7 @@ func (c *containsChecker) Check(params []interface{}, names []string) (result bo
 	return true, ""
 }
 
-var Contains Checker = &containsChecker{&CheckerInfo{Name: "Contains", Params: []string{"Container", "Expected to contain"}}}
+var Contains = &containsChecker{&CheckerInfo{Name: "Contains", Params: []string{"Container", "Expected to contain"}}}
 
 type PackageListSuite struct {
 	// Simple list with "real" packages from stanzas