Formatting changes on Hammer