Update templates to respect PSR2
Apply PHP-CS-Fixer