This pull request also changes indentation which makes the review harder.
Can you revert the indentation change?