diff --git a/Sources/Shout/SSHAuthMethod.swift b/Sources/Shout/SSHAuthMethod.swift
index 34a2f36..ae09392 100644
--- a/Sources/Shout/SSHAuthMethod.swift
+++ b/Sources/Shout/SSHAuthMethod.swift
@@ -13,56 +13,54 @@ public protocol SSHAuthMethod {
 
 /// Password-based authentication method
 public struct SSHPassword: SSHAuthMethod {
-    
     let password: String
-    
+
     /// Creates a new password-based authentication using the given password
     ///
     /// - Parameter password: the password to authenticate with
     public init(_ password: String) {
         self.password = password
     }
-    
+
     public func authenticate(ssh: SSH, username: String) throws {
         try ssh.session.authenticate(username: username, password: password)
     }
-    
 }
 
 /// Agent-based authentication method
 public struct SSHAgent: SSHAuthMethod {
-    
     /// Creates a new agent-based authentication
     public init() {}
-    
+
     public func authenticate(ssh: SSH, username: String) throws {
         let agent = try ssh.session.openAgent()
         try agent.connect()
         try agent.listIdentities()
-        
+
         var last: Agent.PublicKey? = nil
         var success: Bool = false
+
         while let identity = try agent.getIdentity(last: last) {
             if agent.authenticate(username: username, key: identity) {
                 success = true
                 break
             }
+
             last = identity
         }
+
         guard success else {
             throw SSHError.genericError("failed to authenticate using the agent")
         }
     }
-    
 }
 
 /// Key-based authentication method
 public struct SSHKey: SSHAuthMethod {
-    
     public let privateKey: String
     public let publicKey: String
     public let passphrase: String?
-    
+
     /// Creates a new key-based authentication
     ///
     /// - Parameters:
@@ -71,46 +69,22 @@ public struct SSHKey: SSHAuthMethod {
     ///   - passphrase: the passphrase encrypting the key; defaults to nil
     public init(privateKey: String, publicKey: String? = nil, passphrase: String? = nil) {
         self.privateKey = NSString(string: privateKey).expandingTildeInPath
-        if let publicKey = publicKey {
+
+        if let publicKey {
             self.publicKey = NSString(string: publicKey).expandingTildeInPath
         } else {
             self.publicKey = self.privateKey + ".pub"
         }
+
         self.passphrase = passphrase
     }
-    
+
     public func authenticate(ssh: SSH, username: String) throws {
-        // If programatically given a passphrase, use it
-        if let passphrase = passphrase {
-            try ssh.session.authenticate(username: username,
-                                             privateKey: privateKey,
-                                             publicKey: publicKey,
-                                             passphrase: passphrase)
-            return
-        }
-        
-        // Otherwise, try logging in without any passphrase
-        do {
-            try ssh.session.authenticate(username: username,
-                                             privateKey: privateKey,
-                                             publicKey: publicKey,
-                                             passphrase: nil)
-            return
-        } catch {}
-        
-        // If that doesn't work, try using the Agent in case the passphrase has been saved there
-        do {
-            try SSHAgent().authenticate(ssh: ssh, username: username)
-            return
-        } catch {}
-        
-        // Finally, as a fallback, ask for the passphrase
-        let enteredPassphrase = String(cString: getpass("Enter passphrase for \(privateKey) (empty for no passphrase):"))
-        try ssh.session.authenticate(username: username,
-                                         privateKey: privateKey,
-                                         publicKey: publicKey,
-                                         passphrase: enteredPassphrase)
+        try ssh.session.authenticate(
+            username: username,
+            privateKey: privateKey,
+            publicKey: publicKey,
+            passphrase: passphrase
+        )
     }
-    
 }
-