Update notes for submitted changes

* fix executor names, clean up, remove code duplication