instance editor refactor