Refactoring all