Added "TODO" note for cleaning up commonly used lookup variables.