Fix PSR2 compliance