more code cleanup - Gary