Comment cleanup and naming consistency.