Cs fixes

Please revert this. We don't keep closing php tag only for php files, not templates with html.