Fixed PSR2 errors