Refactoring of Yara matches, etc.