Cleaned it up a little bit