Better naming
Swap key bindings
Sorter lines