add comments & remove trailing whitespaces