Refactor ballot editing form to discard organisation array sooner