code cleanup prob 2