Sep11

clean up code