Fixed PSR2 issues