completed Editor refactoring!