Can you clean up the comments?