added more regexp to find variable definitions to replace m