Fix formatting, typos, and add cl-lib dependency

Needed for https://github.com/milkypostman/melpa/pull/1559