Cleaned up embedded spaces, tabs and statement alignment
No logic changes
Merge pull request #1148 from JeffPyeBrook/pr-spacing-and-tabs-fix

Cleaned up embedded spaces, tabs and statement alignment