Correcting names and deleting comments