Removed unneeded functions/definitions
Convert to C++-style comments
Combine both make_clist() code paths