comments, cleanup, and style