Refactoring repository ...