refactor paginator
clean up
refactor and rename paginator