Mostly stylistic changes