Some updates to meet new conventions.
Tabs to spaces

Eugh... those diffs
Minor spacing cleanup