Update notes for submitted changes

* Organize imports according to the template in [1]