Modified duplicate matching algorithm
Fixed code analysis issues
Tidy
Fixed code analysis issues