Task 2: all done except code cleanup.