Optimize setComment, refs #40
Merge pull request #41 from shadowhand/set-comment-cleanup

Optimize setComment, refs #40