diff --git a/cmd/logfile/logfile.go b/cmd/logfile/logfile.go
index 70045453..520e2584 100644
--- a/cmd/logfile/logfile.go
+++ b/cmd/logfile/logfile.go
@@ -11,10 +11,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const (
-	defaultFile   = "wakatime.log"
-	defaultFolder = ".wakatime"
-)
+const defaultFile = "wakatime.log"
 
 // Params contains log file parameters.
 type Params struct {
@@ -60,7 +57,7 @@ func LoadParams(v *viper.Viper) (Params, error) {
 
 	folder, err := ini.WakaResourcesDir()
 	if err != nil {
-		return Params{}, fmt.Errorf("failed getting user's home directory: %s", err)
+		return Params{}, fmt.Errorf("failed getting resource directory: %s", err)
 	}
 
 	params.File = filepath.Join(folder, defaultFile)
diff --git a/cmd/run.go b/cmd/run.go
index f7e0c0b1..9c7baa9a 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -75,7 +75,7 @@ func Run(cmd *cobra.Command, v *viper.Viper) {
 		log.Fatalf("failed to register custom lexers: %s", err)
 	}
 
-	shutdown := func() {}
+	shutdown := shutdownFn(func() {})
 
 	// start profiling if enabled
 	if logFileParams.Metrics {
@@ -159,12 +159,13 @@ func Run(cmd *cobra.Command, v *viper.Viper) {
 		"--config-read",
 		"--config-write",
 		"--entity",
+		"--file-experts",
 		"--offline-count",
 		"--print-offline-heartbeats",
 		"--sync-offline-activity",
 		"--today",
 		"--today-goal",
-		"--useragent",
+		"--user-agent",
 		"--version",
 	}, ", "))
 
diff --git a/pkg/ini/ini.go b/pkg/ini/ini.go
index 17f8129e..82d5ec40 100644
--- a/pkg/ini/ini.go
+++ b/pkg/ini/ini.go
@@ -24,15 +24,6 @@ type WakaHomeType int
 
 const (
 	defaultFolder = ".wakatime"
-	// WakaHomeTypeUnknown is unknown WakaTime home type.
-	WakaHomeTypeUnknown WakaHomeType = iota
-	// WakaHomeTypeEnvVar is WakaTime home type from environment variable.
-	WakaHomeTypeEnvVar
-	// WakaHomeTypeOSDir is WakaTime home type from OS directory.
-	WakaHomeTypeOSDir
-)
-
-const (
 	// defaultFile is the name of the default wakatime config file.
 	defaultFile = ".wakatime.cfg"
 	// defaultInternalFile is the name of the default wakatime internal config file.
@@ -41,6 +32,13 @@ const (
 	DateFormat = time.RFC3339
 	// defaultTimeout is the default timeout for acquiring a lock.
 	defaultTimeout = time.Second * 5
+
+	// WakaHomeTypeUnknown is unknown WakaTime home type.
+	WakaHomeTypeUnknown WakaHomeType = iota
+	// WakaHomeTypeEnvVar is WakaTime home type from environment variable.
+	WakaHomeTypeEnvVar
+	// WakaHomeTypeOSDir is WakaTime home type from OS directory.
+	WakaHomeTypeOSDir
 )
 
 // Writer defines the methods to write to config file.
diff --git a/pkg/ini/ini_test.go b/pkg/ini/ini_test.go
index 313be9ab..a92f8464 100644
--- a/pkg/ini/ini_test.go
+++ b/pkg/ini/ini_test.go
@@ -149,6 +149,7 @@ func TestFilePath(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			v := viper.New()
 			v.Set("config", test.ViperValue)
+
 			err := os.Setenv("WAKATIME_HOME", test.EnvVar)
 			require.NoError(t, err)
 
diff --git a/pkg/offline/legacy.go b/pkg/offline/legacy.go
index 1f64ebc6..ea50534d 100644
--- a/pkg/offline/legacy.go
+++ b/pkg/offline/legacy.go
@@ -10,8 +10,8 @@ import (
 // dbLegacyFilename is the legacy bolt db filename.
 const dbLegacyFilename = ".wakatime.bdb"
 
-// QueueFilepathLegacy returns the legacy path for offline queue db file. If
-// the waka's resource directory cannot be detected, it defaults to the
+// QueueFilepathLegacy returns the path for offline queue db file. If
+// the user's $HOME folder cannot be detected, it defaults to the
 // current directory.
 // This is used to support the old db file name and will be removed in the future.
 func QueueFilepathLegacy() (string, error) {
diff --git a/pkg/offline/offline.go b/pkg/offline/offline.go
index 61719f2a..9a9b12e0 100644
--- a/pkg/offline/offline.go
+++ b/pkg/offline/offline.go
@@ -87,12 +87,12 @@ func WithQueue(filepath string) heartbeat.HandleOption {
 }
 
 // QueueFilepath returns the path for offline queue db file. If
-// the waka's resource directory cannot be detected, it defaults to the
+// the resource directory cannot be detected, it defaults to the
 // current directory.
 func QueueFilepath() (string, error) {
 	folder, err := ini.WakaResourcesDir()
 	if err != nil {
-		return dbFilename, fmt.Errorf("failed getting waka's resource directory, defaulting to current directory: %s", err)
+		return dbFilename, fmt.Errorf("failed getting resource directory, defaulting to current directory: %s", err)
 	}
 
 	return filepath.Join(folder, dbFilename), nil