cleaned it up some