small cleaning in the code