Style fixes
Added some style fixes and missing commas
Additional style fixes
More fixes