7415: refactor