small formatting changes and a little tidying