Refactor wallet events