Update, Refactoring