CLEANUP: Tweak comments.