Update notes for submitted changes

* Refactor Template.parse()