added keybindings. And general coding style cleanup.