Simplified class structure

12 jobs for refactor-pagination in 22 minutes and 30 seconds (queued for 1 second)