Cleaning comments (II)