7213: refactor