CleanUP & add Geom+Hw4