Reformatting indentation

Fixes indentation issues in #719; no semantic changes.  @danmaclean and @r-gaia-cs, can you please check?