Cleaning, organization of code

Matching strategy (size or type choice) can now be selected by changing
value of "UtilFunc". Both strategies can now be run without need to
comment/uncomment any code.