Adding file forgotten previously
Some cleanup