Refactoring event states

Yes, true! Makes it way more simple!