applied PR's page suggestions