rename some vars to make more sense