Cleaning the code, improving the dossier. Final commit, this time for real