style updates
minor style fixes
Merge branch 'style' into next