Fixed unneeded comment and curious data fields