Minor variable refactoring