Refactored variable names in Image macro.
Refactored variable names in Footnote macro.
Overlooked one variable.
Refactored variable names.