Fix mismatched indent style

This commit converts all leading tabs into 4 spaces each, to make indentation
consistent.
Remove trailing whitespace
Merge white space changes from 'altruism'. No functional changes.