formatting
Use event delegation on the module wrapper.
clean up
Bugfix