More PSR2 fixes
More PSR2 fixes