Fixed PSR2 code style issues