Few minor style fixes
Merge pull request #864 from kotarou3/fixes

Few minor style fixes