make PSR2 comliant