Apply Georg's formatting changes