PHP code cleanup per phpcs