One coding improvement done for the morning (and I didn't whack the whole thing out).

Gotta count your little wins.