refactor event spec done