Fix event import #4147
Fix code formatting issues.
Merge pull request #195 from NUBIC/hotfix-1.6.6