Update notes for submitted changes

* Make some refactoring