(#157) Second pass at StyleCop

- 688 to go...