Code: Formatting and Analysis (CA1506).
Merge pull request #757 from am11/master

Code: Formatting and Analysis (CA1506)