code cleanup - Gary