Update notes for submitted changes

* Change code structure a bit