residence refactoring