Update notes for submitted changes

* Refactor main.py and tests for it