Minor Refactoring
Events are saved per channel