Cleaned Keyboard code
Cleaned Analytics code