I did anyway. The code doesn't smell any more :)