Move onclick handler
Remove uneeded onclick handler
It's a class