Add comments on function template
Add function template
Add template for 'short' if..then..else statement