cosmetic changes.  Combined a few lines.