some comments + clean