Keep indentation level consistent

[hunkjazz]

I've noticed that you tried your best to make indentation level at 4 spaces, though there is some places missing this concept. Plus, after this PR of mine, I've realized that I didn't follow this convention.

Said that, I'll be making a PR to fix both our mistakes. Is that OK, with you?