Various stylistic changes