HW2 cleaned up.