Improved compliance with PSR2