Cleaned it up a little more.