Code review comments and general cleanup

removing stub code

use ssh_opts

whitespace

whitespace

whitespace

ssh_opts

whitespace

whitespace

Comments

comments.