Fix event import #4147
Fix code formatting issues.