Visual editor: refactoring