refactor & continue McMeta editor