A bit of cleanup.  Kind of fun.