Improve code for translation module
Merge pull request #476 from singingwolfboy/improve-translation-module

Improve code for translation module