Cleanup of the comments