Some indentation fixes

Suggested by @bbatsov