Style changes and other modifications