Fixed PSR 1/2 errors