~9% code reduction, cleanup, testing, version bump