Refactor Pager