Fix PSR-2 violations