diff --git a/cmd/clairctl/clair/analyze.go b/cmd/clairctl/clair/analyze.go
index cea2bd1a..930646e5 100644
--- a/cmd/clairctl/clair/analyze.go
+++ b/cmd/clairctl/clair/analyze.go
@@ -59,7 +59,7 @@ func analyzeLayer(id string) (v1.LayerEnvelope, error) {
 		return v1.LayerEnvelope{}, fmt.Errorf("reading layer analysis: %v", err)
 	}
 	if response.StatusCode != 200 {
-		//TODO: should I show reponse body in case of error?
+		//TODO(jgsqware): should I show reponse body in case of error?
 		return v1.LayerEnvelope{}, fmt.Errorf("receiving http error: %d", response.StatusCode)
 	}
 
diff --git a/cmd/clairctl/docker/dockerdist/dockerdist.go b/cmd/clairctl/docker/dockerdist/dockerdist.go
index 52b9a951..8fd987cd 100644
--- a/cmd/clairctl/docker/dockerdist/dockerdist.go
+++ b/cmd/clairctl/docker/dockerdist/dockerdist.go
@@ -58,7 +58,7 @@ func getRepositoryClient(image reference.Named, insecure bool, scopes ...string)
 
 	metaHeaders := map[string][]string{}
 	tlsConfig := tlsconfig.ServerDefault
-	//TODO: fix TLS
+	//TODO(jgsqware): fix TLS
 	tlsConfig.InsecureSkipVerify = viper.GetBool("auth.insecureSkipVerify")
 
 	url, err := url.Parse("https://" + image.Hostname())