7233: refactor