Fixed psr2 errors