Refactor

Amendments to events, dispose and discard