Minor code cleanup.
Updated.