Revert "Fixed data persistance issue and inconsistency between accumulated and day data points on days where there is no data recieved. Refactored code for easier reading and efficiency."

This reverts commit 649a921767171f82385bcd2e53db00ac13e93855.
Fixed an issue with the refactored code.. doh