Cleaned it up, bumped the version