moved pagination around // cleanup