some PSR2 coding standard fixes