Clean and comment