Refactoring at its best