comments cleanup