Changing shared context
Formatting/commentation changes