Minor refactoring
Minor fix
Minor fix