7163: refactor