Energy Statistics
	- Lot of code refactor