Comment cleanup.
Function parameter naming changes.