Adding commenting.
Replaced match_name with neater version.