Better keybindings and removed some garbage