PSR coding standards fixes