tidying up a bit
tidying up a bit


Former-commit-id: efd87d368a36f6ca8b0d7251cc9b40134f451fea [formerly 16daf236d32047f1a3bc9eb3ffd1e84803c5c3e7] [formerly fc542f6586dc460ef2d7064d40e2b98216e7b75c]
Former-commit-id: e43383ec93ae2007fe1781e6ba5f1900fc6257cf
Former-commit-id: ccec709ee753f44ff31a88f10e4ccd9976e0481a
dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy