Fix editor indentation issues, and remove unwanted whitespace file edits
Merged in edits to remove whitespace edits by editor