7227: refactor