PSR compliance changes