Refactor WordEditForm