Style and minor key changes