Remove sloppy use of named elements as variables