refactoring act 3 repos