clean him up some