7133: refactor