Updating with many syntax and formatting changes