Cleaning up Pagination 3