Event handling cleanup - should do away with the 'invalid key' beep