comment + cleanning the code