Refactoring for remote repos...