Lint Fixes Part 2

We use 2 space indentation.