Some cleaning and version bump