Update notes for submitted changes

* Refactored cleaner and added cleanup/utils