Yara match code cleanup