7628: refactor