Need to put more rules inside the macro

[siddhant3030]

so currently some data is coming like this VC name, VT name. We need to remove some of these gaps and something like this vc_name.

[Abhishek-N]

this is merged with #5