Refactored vim keys