cleanup and hw07 partII