unit_6-6 clean ups