clean up of homework 2