Fixing PHPCS recomendations