Minor refactoring
Minor refactoring
Minor refactoring