formatting fixes
Merge branch 'fixformatting' ~ spaces, not tabs, github friendly