Comments, cleanup