Cleaned up to use CL.js