Clean this up some more