Changes to EnergyPacket

Changes to EnergyPacket ensuring that it returns that instance of the
variable in the getter methods