refactoring made