Style changes

A few small changes, mostly cosmetic.