Pull out a function.
Fix a comment.