Cleanup pre-review
Final adjustments to keymap