Yes, but I included the 21 days or less ONLY because it was a rule that I often used anyway, and deleting horses outside that range did seem to improve the situation in the test period, so why not.

It's only "retro fitting" if you introduce rules which you wouldn't normally use or which have no real logic behind them, purely because it makes the past figures look better.