Adding warning suppression for VC
Straighten code