diff --git a/wax-prosemirror-components/src/components/comments/Comment.js b/wax-prosemirror-components/src/components/comments/Comment.js
index bffc51e23a510664ff2eee30c39cd4dfcdbfaa3c..fd1c59c3a1687bb4fabe554981efac07054f8b74 100644
--- a/wax-prosemirror-components/src/components/comments/Comment.js
+++ b/wax-prosemirror-components/src/components/comments/Comment.js
@@ -67,7 +67,7 @@ export default ({ comment, activeView, user }) => {
       // saveComment();
     }
 
-    // TODO Also find fragmented marks
+    // TODO pass correct comment pos for notes
     if (conversation.length === 0 && value === '') {
       const commentPosition = DocumentHelpers.findMarkPosition(activeView, comment.pos, 'comment');
       dispatch(state.tr.removeMark(commentPosition.from, commentPosition.to, commentMark));
@@ -75,7 +75,7 @@ export default ({ comment, activeView, user }) => {
   };
 
   const resolveComment = () => {
-    // TODO Also find fragmented marks
+    // TODO pass correct comment pos for notes
     const commentPosition = DocumentHelpers.findMarkPoistion(activeView, comment.pos, 'comment');
     dispatch(state.tr.removeMark(commentPosition.from, commentPosition.to, commentMark));
   };
diff --git a/wax-prosemirror-utilities/src/document/DocumentHelpers.js b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
index e6ad8a8d6f634fa364f4787a7a7826d576319b48..3f1e2d59d23c977f46079507e922172c86854d37 100644
--- a/wax-prosemirror-utilities/src/document/DocumentHelpers.js
+++ b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
@@ -96,10 +96,11 @@ const findAllCommentsWithSameId = state => {
   return allCommentsWithSameId;
 };
 
+// TODO Also find fragmented marks
 const findMarkPosition = (activeView, initialPos, markType) => {
-  let $pos = activeView.state.tr.doc.resolve(initialPos);
-  let parent = $pos.parent;
-  let start = parent.childAfter($pos.parentOffset);
+  const $pos = activeView.state.tr.doc.resolve(initialPos);
+  const { parent } = $pos;
+  const start = parent.childAfter($pos.parentOffset);
   if (!start.node) return null;
   const actualMark = start.node.marks.find(mark => mark.type.name === markType);
   let startIndex = $pos.index();