Clarify comments and naming.