Minor cleanup.
Updated.