Fix PSR-1 issues