minor cleanup to variable naming