adressed Ning's code review comments on sftp-feature