Fixed PSR coding style where possible