Pagination
clean up code