refactoring with properties file
updates to event services and refactoring