Comment, cleanup