CS fixes (upgraded PHP-CS-Fixer from 0.5.7 to 1.3)