* Slight code cleanup.