Few modifications to be PSR compliant