6902: refactor