Finished cleaning up pagination