Update notes for submitted changes

* Refactor some parser code