cleaned things up some more