6911: refactor