Fixing a printout bug
Some cleaning
Moving cdanslair logic in its own module