Some small code cleanup and version bump