Fixed more pagination, PEP8