Minor refactoring
Minor refactor