Cleaning up Pagination 4