Appease StyleCop and make a few minor tweaks