Thanks for the improvements.

I do normally use a lot of variables in my scripts, but in this case it might be better to do not for @table because the actual...