7172: refactor!