Just some stuff to reorganize the list of devices in HeatTickHandler