Small cleanup and version bump