Adding keyboard event handling
Cleaning up JSONs