Qual: Clean code
Merge pull request #765 from grandoc/develop

display enhancement and normalize
fix error translation