various PSR2 fixes