Comments, style fixes