Indentation improvements

Courtesy to Cyberuben for pointing this out to me.

Also I found a problem in the process, hence why it was pointed out.