Refactored the event monitoring state. #14