lint
move paginator out
paginator does not need clause