more PSR2 fixes