Removed extra comma at the end of the JSON list
Updated the matched internal functions.

The functions are now explicitly spelled out instead of doing some
complicated regex expressions