style fixes
Merge branch 'master' into gms.com