Cleaning/add comments