6914: refactor