Some language clean up
Merge pull request #203 from sej7278/master

Some language clean up
Rebasing 1.5 branch