Cleaned it up some