Some more trivial edits for neatness and formatting.