PSR2 coding standard fixes