PSR code fixes