cleaned the file and the functions order