Make minor changes in doc comments, formatting, and names.