EditorServer refactpr