7190: refactor