Refactoring Paginators