all in refactoring