Minor variable name cleanup