Use the addVariableName method instead of manually adding entries to
the varmap.
Removed commented out lines.