Analysis: (CA1502) Avoid excessive complexity.
Analysis: (CA1822) Mark members as static.
Analysis: (CA1823) Avoid unused private fields.
Merge pull request #332 from am11/master

Analysis: Fixes various CA warnings