cleanup of HW1 - Chris