Refactor of the ssh modifications