some more PSR2 fixes, only long lines are left...