better form, fixed states with spaces in names