Clean up the comments