Remove some trailing spaces + fix indentation
Merge branch 'identation_changes'