clean up and refactor for morc 1.1.0