Tidy up indentation in a few places.
Merge pull request #350 from phad/master

Tidy up indentation in a few places.