got rid of all trailing commas. made indentation consistent in all templates.