Small refactoring
Adding check for bugs that need cwe assigned