Tidying up

phpcs based improvements