refactoring conding std
conding std fixes for pull request #996