Kdrefactor

I've changed the names but I'm not sure I think in the same way as you.