code cleanup2