code cleanup, version bump