Cleanup
Improved editor.word method