Fixed PSR issues