Just watched PeepCode's screencast. Enlightening!

Here's the start of the improvements.