clean up some code.