Cleanups 1

3 otherwise unrelated cleanups and doc updates. Nothing spectacular here.
The indentation looks wrong here on github even though the tester is happy. Why is that?