Requesting reformatting of code

[TonyGravagno]

Indentations in the code mislead a newcomer about code flow. I recommend reformating the code in a dedicated commit.