Several small formatting tweaks