cleaned and uppdated comments