Add KeyEventType
Make style more readable