Update notes for submitted changes

* Restructure code a bit