Fix Daniel's comments