7620: refactor