Some minor cleanup and version bump