7032: refactor