Update notes for submitted changes

* Cleanup method/varible ordering in the various places they are defined