Refactoring: editor and storage