Minor refactoring
Minor refactoring 2