Some minor cosmetic changes

* Refactored some code
* Changed cl-ncurses to cl-charms