code cleanup....