fix some PSR-2 issues