Clean it up some