A few stylistic changes