Improved complexity metric
Improved clone detection