7209: refactor