us refactoring