Improving the Unification of Software Clones using Tree and Graph Matching Algorithms