Cleaning up the code a bit

- removing commented code
- added missing event.error default
- default events now specify empty closure