Clean and comment code