Changes and simplifications from James Malone for the latest EFO release