Make indentation consistent across the project

[traiansf]

The codebase employs several indentation styles. We should maybe converge on one and update the code to reflect it.

[wkolowski]

@traiansf I made the top-level indentation consistent some time ago. Is more consistency worth pursuing, if we don't have a linter? If not, maybe this issue should be closed.