[dba-VB] Control handles

Hi all
 
I'm using vb2005 win forms and I have around 30 command buttons on a form  
(where else). I use the Click event to fire a procedure. Rather that have 
the  code for each command button, I've added to the end of the first command 
button  click event multiple handles, one for each cmd button.
 
so I have 
Private Sub Button1_Click(sender etc., e etc.,) Handles Button1.click,  
Button2.click and so on...
 
End Sub
 
I think this is a bit clunky. Is there a better way?
 
TIA
john cliviger