editor reafactoring