refactor models/event_spec