Update notes for submitted changes

* Refactor and add a check around a variable