Clean up comment and clean up