clean and comment