Updates to speed up build process
Cleaned up a few StyleCop rules