Tidy up, version bump