Formatting changes to map