Fix phpcs coding violations