Add and edit comments.
Tiny refactoring: break out function, rename field.