various small formatting changes