Some clean-ups
Convert interface based event handler to delegate based