Applied phpcs changes