Minor cleanup eventhandler template