And I see you know exactly what is wrong with it and also the general direction to make it better.
It EVEN has a section LOW HANGING FRUITS on it! WHY THE DEUCE didn't you made it right out of the gate, then!?!?!?!?
I feel your pain and this is why I left the comment in the first place. I was thinking about you, fellow colleague!
I was spinning a bunch of plates at the same time in here and couldn't spend even more time on this specific piece. Let's face it: it is normal, people. It happens on a daily basis. =)
Please, don't ask that question.
Now you have a great chance of doing it. How about that? :D If you have the time and see the path, just do it! It will make all our lives better. And it is going to be great.
Also read the Pragmatic Programmer. I luv you. <3