This does happen a lot, but have you ever had the opposite happen? Where you go into some of your older code, and not only is it nice to read, but you had anticipated that you'd have to make this change later, and so the design makes the change easy? That's happened to me a few times and all I can say is that it takes days for my self-satisfaction to wane.