clean it up some, maybe