Here's another splitting. Here, I'd say just remove the entire second clause (lines 173 to 183) and maybe say something like "that match our question".