Update notes for submitted changes

* Remove code duplication Part 2