Comments, cleanup.