OPSINT-783 refactoring