Changed keybinding to avoid conflict
Refactorings