#13 - Refactor collaborativeEdit and typo fix