cleaning up some code.