Refactoring repeater again to reduce individial method complexity