even further formatting changes