Improved energy display. Cleanup