first commit of the clean-comments branch