Minor refactor for readability