Minor fix
Refactoring
Refactoring