Update notes for submitted changes

* Refactor large method into 4 methods