Improve the code quality for Klocwork