Code refactoring
Update event-kit
no message