(refactor) Clearly mark templates