make PSR1/PSR2 compliant