diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index 68135a4f0..e30a0a785 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -89,10 +89,7 @@ type keyStorePassphrase struct {
 }
 
 func NewKeyStorePassphrase(path string) KeyStore2 {
-	ks := &keyStorePassphrase{
-		keysDirPath : path,
-	}
-	return ks
+	return &keyStorePassphrase{path}
 }
 
 func (ks keyStorePassphrase) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) {
@@ -105,8 +102,8 @@ func (ks keyStorePassphrase) GetKey(keyId *uuid.UUID, auth string) (key *Key, er
 		return nil, err
 	}
 	key = &Key{
-		Id : keyId,
-		PrivateKey : ToECDSA(keyBytes),
+		Id:         keyId,
+		PrivateKey: ToECDSA(keyBytes),
 	}
 	return key, err
 }
diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go
index 2aa813f5e..b6e2a309a 100644
--- a/crypto/key_store_plain.go
+++ b/crypto/key_store_plain.go
@@ -54,9 +54,7 @@ func DefaultDataDir() string {
 }
 
 func NewKeyStorePlain(path string) KeyStore2 {
-	ks := new(keyStorePlain)
-	ks.keysDirPath = path
-	return ks
+	return &keyStorePlain{path}
 }
 
 func (ks keyStorePlain) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) {