Paginator cleanup according to style guide