Further stylistic changes