clean up some more code