Update notes for submitted changes

* Various cleanup and reorganization