Bumped version, cleaned up code