more clean up
clean up code