Fixed PSR-2 violations