Refactor events to use .NET framework guidelines