Paginate and some clean up