Mostly stylistic changes. base