A few more edits for lint/hint