Changes for Code Analysis

Only metrics related scripts were changed.