[US20] Refactoring