Cleaning up Pagination 2