#164 further cleanup
#164 pagination cleanup