code cleanup - generic