fix code styling for consistency
Merge pull request #2999 from tchak/fix-style

fix code styling for consistency