HW7 Extra credit, cleanup and submit.