Code cleanup, version bump