More small formatting changes