Be PSR compliant