Simplified keybinding handling, cleaned headers.