cleaned up some more