Code tidy
Use new event registration system
0.7.0