I've split it up a little differently than you described, but I hope my change is in the spirit of what you meant.  Let me know if you had something more specific in mind.