Mostly cosmetic changes

Added minor, mostly cosmetic changes.