updated some comments and cleaned up code
Merge branch 'master' of https://github.com/TDASinternal/template-override-poc