Remove remenants of manual merge.
Rename temp to temperature

Reasons:
  1. Temp is ambiguous
  2. nextTemperature is fully spelled out
  3. IT IS JUST THE RIGHT THING TO DO

!! ALSO FIXED FORMATTING AHH !!