Update notes for submitted changes

* Restructure client code