code cleanup pt2