Comments and small cleaning