code optimization and style changing
Merge branch 'master' of github.com:ChinaraIsabaeva/switch-translate