diff --git a/config/config.go b/config/config.go
index cf5cced44..5c8f202a7 100644
--- a/config/config.go
+++ b/config/config.go
@@ -43,9 +43,16 @@ type Config struct {
 	Bootstrap []*BootstrapPeer // local nodes's bootstrap peers
 }
 
+// DefaultPathRoot is the path to the default config dir location.
 const DefaultPathRoot = "~/.go-ipfs"
+
+// DefaultConfigFile is the filename of the configuration file
 const DefaultConfigFile = "config"
+
+// DefaultDataStoreDirectory is the directory to store all the local IPFS data.
 const DefaultDataStoreDirectory = "datastore"
+
+// EnvDir is the environment variable used to change the path root.
 const EnvDir = "IPFS_DIR"
 
 // PathRoot returns the default configuration root directory
@@ -65,13 +72,11 @@ func Path(configroot, extension string) (string, error) {
 		dir, err := PathRoot()
 		if err != nil {
 			return "", err
-		} else {
-			return filepath.Join(dir, extension), nil
 		}
+		return filepath.Join(dir, extension), nil
 
-	} else {
-		return filepath.Join(configroot, extension), nil
 	}
+	return filepath.Join(configroot, extension), nil
 }
 
 // DataStorePath returns the default data store path given a configuration root