Code cleaning
CQL WIP
CQL WIP