Update notes for submitted changes

* Reorganize imports and make constants uppercase