Get rid of dependency on s
Don't use CL functions anymore
Remap keys in a better way
Adjust line length