Not only fixes but also style changes.