7695: refactor