general code cleaning and version bump in comments