Minor refactoring in variable location