CLeanup and comments.