Small (mostly cosmetic/stylistic) changes