Update notes for submitted changes

* Refact CLI code