comments cleanup
comments cleanup