A few more small formatting fixes