Fix comments from PR 7