Refactoring Editor class