Further code cleanup.