Update notes for submitted changes

* Refactor code into common base class