refactored Editor
refactored Output