Cleanup some syntax. Bumped version