Refactor Repeater helper