refactoring was done