Update notes for submitted changes

* Update implementation and remove TODO comment