further simplified the paginator