Fixing PSR-2 compliance