Refactoring update.