Minor cleanup, version bump