Tidy the code.
Fix the finding on the right collector.