More consistent variable usage