fixed some small formatting issues
Merge branch 'ido'