rename some vars to be more self-documenting