Refactor model: Event