Adding event streams
- Cleaning up code.