Cleaning redundancy and adding more field options.