Cleaned it up some more