Cleaned up the CLM class