7252: refactor