Ugh, cleaned it up some more