Mostly just cosmetic changes. Also extracted `download_dataset` from
WikiEnergy class.