some PSR-2 fixes