Template helper functions
Typo and comments