Remove unneeded global variable.
Standardize image tags.