hopefully actually fixed indents.
Included @jvazquez-r7 suggested changes