style and voice
Merge pull request #2354 from tysonn/master

style and voice