Refactored EnergyResults and Results to push shared functionality into Results