CommentOutlining code cleanup