more formatting changes, see #6