Minor refactor for clarity