code cleanup performed