Refactoring repeater