fix formatting and tabs
Merge pull request #876 from dlobo/MiscFixes

fix formatting and tabs