Cleaning up Pagination