Cosmetic changes.
A few other minor changes