Cleaned up CL class a little.