Variable name changes, code cleanup.