Cleanups
Started refactoring editorview