Cleaned up the templates, no functional change. Just removed comments for terseness