Revert "various changes -- mostly cosmetics"

This reverts commit dd77b3fef336b3629ac2e9b74c11c4d836fa257c.