Lots of stylistic and cosmetic changes