improve volume metric
improve Cyclomatic Complexity metric