Minor refactoring for clarity
Minor refactoring