Update notes for submitted changes

* Refactor decorators