Clean up imports; use more autoloads
Cleanup prompt function
Generalize; cleanup git function; use cl-defsubst