Code beautification & version bump