clean up some code
clean up more code