Little more code cleanup.