Cleanups in energy classes

Merge request reports

Loading