Add back two strings being removed from merge.
Fix all issues in Jason's review comments
Refactor some of repeated lines in Editor.js to a private function.