Swapped the goodness fields with a single array and updated/trimmed the class accordingly.