Remove template comments
Bracket spacing changes