diff --git a/.tool/lint b/.tool/lint
index eac80e98..fc9187c8 100755
--- a/.tool/lint
+++ b/.tool/lint
@@ -4,20 +4,31 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-for d in $(find . -type d -not -iwholename '*.git*' -a -not -iname '.tool' -a -not -iwholename '*vendor*' -a -not -iwholename '*.artifacts*' -a -not -iwholename '*contrib*' -a -not -iwholename '*test*' -a -not -iwholename '*logo*' -a -not -iwholename '*conmon*' -a -not -iwholename '*completions*' -a -not -iwholename '*docs*' -a -not -iwholename '*pause*'); do
-	${GOPATH}/bin/gometalinter \
-		 --exclude='error return value not checked.*(Close|Log|Print|RemoveAll).*\(errcheck\)$' \
-		 --exclude='declaration of.*err.*shadows declaration.*\(vetshadow\)$' \
-		 --exclude='.*_test\.go:.*error return value not checked.*\(errcheck\)$' \
-		 --exclude='duplicate of.*_test.go.*\(dupl\)$' \
-		 --exclude='cmd\/client\/.*\.go.*\(dupl\)$' \
-		 --exclude='vendor\/.*' \
-		 --exclude='server\/seccomp\/.*\.go.*$' \
-		 --disable=aligncheck \
-		 --disable=gotype \
-		 --disable=gas \
-		 --cyclo-over=80 \
-		 --dupl-threshold=100 \
-		 --tests \
-		 --deadline=600s "${d}"
-done
+PKGS=$(find . -type d -not -path . -a -not -iwholename '*.git*' -a -not -iname '.tool' -a -not -iwholename '*vendor*' -a -not -iname 'hack' -a -not -iwholename '*.artifacts*' -a -not -iwholename '*contrib*' -a -not -iwholename '*test*' -a -not -iwholename '*logo*' -a -not -iwholename '*conmon*' -a -not -iwholename '*completions*' -a -not -iwholename '*docs*' -a -not -iwholename '*pause*')
+
+${GOPATH}/bin/gometalinter \
+	--concurrency=4\
+	--enable-gc\
+	--vendored-linters\
+	--deadline=600s --disable-all\
+	--enable=deadcode\
+	--enable=errcheck\
+	--enable=goconst\
+	--enable=gofmt\
+	--enable=golint\
+	--enable=ineffassign\
+	--enable=interfacer\
+	--enable=megacheck\
+	--enable=misspell\
+	--enable=structcheck\
+	--enable=varcheck\
+	--enable=vet\
+	--enable=vetshadow\
+	--exclude='error return value not checked.*\(errcheck\)$'\
+	--exclude='declaration of.*err.*shadows declaration.*\(vetshadow\)$'\
+	--exclude='.*_test\.go:.*error return value not checked.*\(errcheck\)$'\
+	--exclude='duplicate of.*_test.go.*\(dupl\)$'\
+	--exclude='cmd\/client\/.*\.go.*\(dupl\)$'\
+	--exclude='vendor\/.*'\
+	--exclude='server\/seccomp\/.*\.go.*$'\
+	${PKGS[@]}
diff --git a/cmd/kpod/formats/templates.go b/cmd/kpod/formats/templates.go
index be135dbd..c2582552 100644
--- a/cmd/kpod/formats/templates.go
+++ b/cmd/kpod/formats/templates.go
@@ -30,7 +30,7 @@ var basicFunctions = template.FuncMap{
 // HeaderFunctions are used to created headers of a table.
 // This is a replacement of basicFunctions for header generation
 // because we want the header to remain intact.
-// Some functions like `split` are irrevelant so not added.
+// Some functions like `split` are irrelevant so not added.
 var headerFunctions = template.FuncMap{
 	"json": func(v string) string {
 		return v
diff --git a/cmd/kpod/inspect.go b/cmd/kpod/inspect.go
index 5371a495..285d5e7d 100644
--- a/cmd/kpod/inspect.go
+++ b/cmd/kpod/inspect.go
@@ -85,14 +85,14 @@ func inspectCmd(c *cli.Context) error {
 			return errors.Wrapf(err, "error parsing container data")
 		}
 	case inspectTypeImage:
-		data, err = libkpodimage.GetImageData(server.Store(), name)
+		data, err = libkpodimage.GetData(server.Store(), name)
 		if err != nil {
 			return errors.Wrapf(err, "error parsing image data")
 		}
 	case inspectAll:
 		ctrData, err := server.GetContainerData(name, size)
 		if err != nil {
-			imgData, err := libkpodimage.GetImageData(server.Store(), name)
+			imgData, err := libkpodimage.GetData(server.Store(), name)
 			if err != nil {
 				return errors.Wrapf(err, "error parsing container or image data")
 			}
diff --git a/cmd/kpod/main.go b/cmd/kpod/main.go
index 2aa29845..937c1d76 100644
--- a/cmd/kpod/main.go
+++ b/cmd/kpod/main.go
@@ -8,9 +8,6 @@ import (
 	"github.com/urfave/cli"
 )
 
-//Version of kpod
-const Version string = "0.0.1"
-
 func main() {
 	if reexec.Init() {
 		return
@@ -19,7 +16,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "kpod"
 	app.Usage = "manage pods and images"
-	app.Version = Version
+	app.Version = "0.0.1"
 
 	app.Commands = []cli.Command{
 		diffCommand,
diff --git a/cmd/kpod/version.go b/cmd/kpod/version.go
index 908ffe40..9680c900 100644
--- a/cmd/kpod/version.go
+++ b/cmd/kpod/version.go
@@ -17,7 +17,7 @@ var (
 
 // versionCmd gets and prints version info for version command
 func versionCmd(c *cli.Context) error {
-	fmt.Println("Version:      ", Version)
+	fmt.Println("Version:      ", c.App.Version)
 	fmt.Println("Go Version:   ", runtime.Version())
 	if gitCommit != "" {
 		fmt.Println("Git Commit:   ", gitCommit)
diff --git a/libkpod/container_data.go b/libkpod/container_data.go
index 97b00fe9..96556b25 100644
--- a/libkpod/container_data.go
+++ b/libkpod/container_data.go
@@ -77,7 +77,7 @@ func (c *ContainerServer) GetContainerData(name string, size bool) (*ContainerDa
 	if container.ImageID == "" {
 		return nil, errors.Errorf("error reading container image data: container is not based on an image")
 	}
-	imageData, err := libkpodimage.GetImageData(c.store, container.ImageID)
+	imageData, err := libkpodimage.GetData(c.store, container.ImageID)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error reading container image data")
 	}
diff --git a/libkpod/image/image.go b/libkpod/image/image.go
index 6ed609b2..20e6f5d9 100644
--- a/libkpod/image/image.go
+++ b/libkpod/image/image.go
@@ -122,19 +122,13 @@ func matchesLabel(info *types.ImageInspectInfo, store storage.Store, label strin
 // Returns true if the image was created since the filter image.  Returns
 // false otherwise
 func matchesBeforeImage(info *types.ImageInspectInfo, name string, params *FilterParams) bool {
-	if info.Created.Before(params.beforeImage) {
-		return true
-	}
-	return false
+	return info.Created.Before(params.beforeImage)
 }
 
 // Returns true if the image was created since the filter image.  Returns
 // false otherwise
 func matchesSinceImage(info *types.ImageInspectInfo, name string, params *FilterParams) bool {
-	if info.Created.After(params.sinceImage) {
-		return true
-	}
-	return false
+	return info.Created.After(params.sinceImage)
 }
 
 // MatchesID returns true if argID is a full or partial match for id
diff --git a/libkpod/image/image_data.go b/libkpod/image/image_data.go
index 8945b1b5..900ff3ff 100644
--- a/libkpod/image/image_data.go
+++ b/libkpod/image/image_data.go
@@ -13,9 +13,9 @@ import (
 	"github.com/pkg/errors"
 )
 
-// ImageData handles the data used when inspecting a container
+// Data handles the data used when inspecting a container
 // nolint
-type ImageData struct {
+type Data struct {
 	ID           string
 	Tags         []string
 	Digests      []string
@@ -75,8 +75,8 @@ func annotations(manifest []byte, manifestType string) map[string]string {
 	return annotations
 }
 
-// GetImageData gets the ImageData for a container with the given name in the given store.
-func GetImageData(store storage.Store, name string) (*ImageData, error) {
+// GetData gets the Data for a container with the given name in the given store.
+func GetData(store storage.Store, name string) (*Data, error) {
 	img, err := FindImage(store, name)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error reading image %q", name)
@@ -140,7 +140,7 @@ func GetImageData(store storage.Store, name string) (*ImageData, error) {
 		historyCreatedBy = config.History[len(config.History)-1].CreatedBy
 	}
 
-	return &ImageData{
+	return &Data{
 		ID:           img.ID,
 		Tags:         tags,
 		Digests:      digests,
diff --git a/libkpod/logs.go b/libkpod/logs.go
index fb484b13..00b0f016 100644
--- a/libkpod/logs.go
+++ b/libkpod/logs.go
@@ -42,7 +42,7 @@ func (c *ContainerServer) GetLogs(container string, logChan chan string, opts Lo
 
 	t, err := tail.TailFile(logsFile, tail.Config{Follow: false, ReOpen: false, Location: seekInfo})
 	for line := range t.Lines {
-		if since, err := logSinceTime(opts.SinceTime, line.Text); err != nil || since == false {
+		if since, err := logSinceTime(opts.SinceTime, line.Text); err != nil || !since {
 			continue
 		}
 		logMessage := line.Text[secondSpaceIndex(line.Text):]
diff --git a/pkg/storage/image.go b/pkg/storage/image.go
index 5a52d81c..f3948fb4 100644
--- a/pkg/storage/image.go
+++ b/pkg/storage/image.go
@@ -269,7 +269,7 @@ func (svc *imageService) isSecureIndex(indexName string) bool {
 	for _, addr := range addrs {
 		for _, ipnet := range svc.insecureRegistryCIDRs {
 			// check if the addr falls in the subnet
-			if (*net.IPNet)(ipnet).Contains(addr) {
+			if ipnet.Contains(addr) {
 				return false
 			}
 		}