Minor modification on PSR compliant