Fixed PSR2 conventions