Code style - PSR-2 fixes