Refactoring was done