Refactor

or we could drop `UsesPaginator` since it would be approximatly the same.