Clean and comment source