streamline the code a bit.  Speed is not really an issue, but it is nice
to at least make it look tidy.