Slight code cleanup.