Minor refactoring
Minor refactoring