Some minor stylistic changes