cleaning up some more