Make code PSR compliant