Cleaned up a couple of fields