Adding refactoring