Polished the comment functionality