more repo refactoring