Cleaning up the comments