Stylistic changes.
Change some comments around