SSH refactors