Tidy of Goal Form (before new fields added)