Minor variable refactorings