Style Fixes

Fixed a lot of our style problems. Got the count down to around 130 from 700+.