PSR2 standard improvement