Remove some event handling redundancy