Fix PSR-2 issues