PSR-2 errors fixed