Some cleaning up.  Minor.