Minor refactor to test new SSH key
Additional minor refactoring