Standardise use of comparative methods

Standardise use of comparative methods across battles maps and use full
variable names.