Cleaned it up a little