Refactoring

do it