Refactoring

previous commit review