Fixing PSR-2 errors