Minor refactoring: rename local variables