Update notes for submitted changes

* Remove decorators and move to utils