Cleaned up Event model