diff --git a/.metadata.sh b/.metadata.sh
index dd683d8c..d329ad7d 100755
--- a/.metadata.sh
+++ b/.metadata.sh
@@ -11,7 +11,7 @@ HBREPO="golift/homebrew-mugs"
 MAINT="David Newhall II <david at sleepers dot pro>"
 VENDOR="Go Lift <code at golift dot io>"
 DESC="Polls a UniFi controller and exports metrics to InfluxDB"
-GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals -D dupl -D lll -e G101 "
+GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals -D dupl -D lll"
 # Example must exist at examples/$CONFIG_FILE.example
 CONFIG_FILE="up.conf"
 LICENSE="MIT"
diff --git a/unifipoller/config.go b/unifipoller/config.go
index 09d20b83..f75499b2 100644
--- a/unifipoller/config.go
+++ b/unifipoller/config.go
@@ -16,7 +16,7 @@ import (
 	influx "github.com/influxdata/influxdb1-client/v2"
 	"github.com/spf13/pflag"
 	"golift.io/unifi"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 // Version is injected by the Makefile
@@ -24,13 +24,13 @@ var Version = "development"
 
 const (
 	// App defaults in case they're missing from the config.
-	defaultInterval = 30 * time.Second
-	defaultInfxDb   = "unifi"
-	defaultInfxUser = "unifi"
-	defaultInfxPass = "unifi"
-	defaultInfxURL  = "http://127.0.0.1:8086"
-	defaultUnifUser = "influx"
-	defaultUnifURL  = "https://127.0.0.1:8443"
+	defaultInterval   = 30 * time.Second
+	defaultInfluxDB   = "unifi"
+	defaultInfluxUser = "unifi"
+	defaultInfluxPass = "unifi"
+	defaultInfluxURL  = "http://127.0.0.1:8086"
+	defaultUnifiUser  = "influx"
+	defaultUnifiURL   = "https://127.0.0.1:8443"
 )
 
 // ENVConfigPrefix is the prefix appended to an env variable tag
diff --git a/unifipoller/start.go b/unifipoller/start.go
index c05d08a5..df26aaa2 100644
--- a/unifipoller/start.go
+++ b/unifipoller/start.go
@@ -16,16 +16,17 @@ import (
 // Parses flags, parses config and executes Run().
 func Start() error {
 	log.SetFlags(log.LstdFlags)
-	up := &UnifiPoller{Flag: &Flag{},
+	up := &UnifiPoller{
+		Flag: &Flag{},
 		Config: &Config{
 			// Preload our defaults.
-			InfluxURL:  defaultInfxURL,
-			InfluxUser: defaultInfxUser,
-			InfluxPass: defaultInfxPass,
-			InfluxDB:   defaultInfxDb,
-			UnifiUser:  defaultUnifUser,
+			InfluxURL:  defaultInfluxURL,
+			InfluxUser: defaultInfluxUser,
+			InfluxPass: defaultInfluxPass,
+			InfluxDB:   defaultInfluxDB,
+			UnifiUser:  defaultUnifiUser,
 			UnifiPass:  os.Getenv("UNIFI_PASSWORD"), // deprecated name.
-			UnifiBase:  defaultUnifURL,
+			UnifiBase:  defaultUnifiURL,
 			Interval:   Duration{defaultInterval},
 			Sites:      []string{"all"},
 		}}
@@ -53,14 +54,14 @@ func Start() error {
 func (f *Flag) Parse(args []string) {
 	f.FlagSet = pflag.NewFlagSet("unifi-poller", pflag.ExitOnError)
 	f.Usage = func() {
-		fmt.Println("Usage: unifi-poller [--config=filepath] [--version]")
+		fmt.Println("Usage: unifi-poller [--config=/path/to/up.conf] [--version]")
 		f.PrintDefaults()
 	}
 	f.StringVarP(&f.DumpJSON, "dumpjson", "j", "",
 		"This debug option prints a json payload and exits. See man page for more info.")
 	f.StringVarP(&f.ConfigFile, "config", "c", DefaultConfFile, "Poller config file path.")
 	f.BoolVarP(&f.ShowVer, "version", "v", false, "Print the version and exit.")
-	_ = f.FlagSet.Parse(args)
+	_ = f.FlagSet.Parse(args) // pflag.ExitOnError means this will never return error.
 }
 
 // Run invokes all the application logic and routines.