Comment cleanup.
Updated.