It's quite nice having it near the data that it needs to match, though. I'm still +1 on splitting this up, it might well help.