Removed extraTODO
Added page queries
Fixed line formatting