Minor cleanup and version bump