StyleCop and other updates