Clean up code. Remove 'CQL' prefix from class name