Update notes for submitted changes

* refact api code to make it more clean