Some further formatting changes