Eliminated some duplicate var names.