Formatting changes part 2