usa refactor