Clean it up some more