comments, cleanup