StyleCop

Running StyleCop on code and fixing a few things