Merge "Conduct non-functional refactoring for EventLogger"