Refactored Ongoing Effects into a separate class