Code cleaning and add librairies