Refactoring Update