Some codestyle consistency
- Style checked
Merge branch 'matiit-code-clean-src'
- Fixed bug from coding style contribution