Small refactor of EnergyValue