Updated code formatting for stricter StyleCop comformance.  *whew!*