Some comments clean-up