Fix a bunch of small formatting issues