Fixes for PSR-2 coding styles errors and warnings.