Refactor cycle over pages / comments