Style.
More shuffling things around.
Added hotkey to kill the current buffer faster.