Cleaned it up a bit..