Refactored saveEvent sum for better logic flow
Refactored saveEvent some for better logical flow