7702: refactor