Refactoring update