Make code slightly easier to read.
Hide a variable in the only scope where it is used.

Also put braces around a longish code block.
Leave a note and a TODO.
Fix a typo.
Merge pull request #215 from bangerth/cleanups-1

Cleanups and doc updates