Many small formatting changes.