PSR code improvements