Refactoring goes very well