[US45] Unify code