White space normalization

Converted tabs to spaces and re-indented stuff.