Cleanup
Refactored UpdateConsumptionValues(), fixes #51