Code comments cleanup