Mostly cosmetic and Style changes