diff --git a/juju/osenv/home.go b/juju/osenv/home.go
index <HASH>..<HASH> 100644
--- a/juju/osenv/home.go
+++ b/juju/osenv/home.go
@@ -49,15 +49,15 @@ func JujuHomePath(names ...string) string {
 
 // JujuHome returns the directory where juju should store application-specific files
 func JujuHomeDir() string {
-	JujuHomeEnvKey := os.Getenv(JujuHomeEnvKey)
-	if JujuHomeEnvKey == "" {
+	JujuHomeDir := os.Getenv(JujuHomeEnvKey)
+	if JujuHomeDir == "" {
 		if runtime.GOOS == "windows" {
-			JujuHomeEnvKey = jujuHomeWin()
+			JujuHomeDir = jujuHomeWin()
 		} else {
-			JujuHomeEnvKey = jujuHomeLinux()
+			JujuHomeDir = jujuHomeLinux()
 		}
 	}
-	return JujuHomeEnvKey
+	return JujuHomeDir
 }
 
 // jujuHomeLinux returns the directory where juju should store application-specific files on Linux.
diff --git a/utils/apt.go b/utils/apt.go
index <HASH>..<HASH> 100644
--- a/utils/apt.go
+++ b/utils/apt.go
@@ -11,8 +11,9 @@ import (
 	"regexp"
 	"strings"
 
-	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/loggo"
+
+	"launchpad.net/juju-core/juju/osenv"
 )
 
 var (
Made changes from axw's review.