major formatting changes