code quality
Merge pull request #1193 from infograf768/code-quality_multilang

multilang code quality