Minor variable name and other cleanup