Update autopkg improvement after Greg's comments to be more python's style.