stylistic changes and comments