Made misc cosmetic changes.