make PSR2 compliant