Minor refactoring
Refactoring
updated version