Minor. Comments and cleanup