A little code cleanup.