Many formatting changes