Mostly cosmetic style changes