Some refactoring
Minor refactoring