Minor changes for consistent code style
Merge branch 'style'