Merge pull request #2456 from Diapolo/code-layout
small indentation, space, formatting fixes (no code changes)