Fix static analysis problems of high order
Refactoring and static analysis tools warning correction