Standardizing definitions, clean-up, version bump