Minor refactor
Minor refactor