Cleaning up the keyup/keydown code
- TODO: Still state is available, need to resolve