Refactoring immediately