Minor updates for consistent coding style
Merge branch 'style'