Slight refactor SSHClient, will be useful later.
Merge pull request #1454 from mfalesni/ssh-update-1

Slight refactor SSHClient, will be useful later.