7438: refactor