Minor comments cleanup